From: Kenichi Handa <handa@m17n.org>
Date: Mon, 19 Aug 2002 02:46:28 +0000 (+0000)
Subject: (COMPOSITION_MODIFICATION_FUNC): If PROP is not a cons, return Qnil.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~31115
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=dec3cf5be08b5fa8f99d31f3f3cbdd239bfe19d9;p=emacs.git

(COMPOSITION_MODIFICATION_FUNC): If PROP is not a cons, return Qnil.
---

diff --git a/src/composite.h b/src/composite.h
index e30deabb7f6..ce47aee7098 100644
--- a/src/composite.h
+++ b/src/composite.h
@@ -76,7 +76,7 @@ extern Lisp_Object composition_temp;
 #define COMPOSITION_MODIFICATION_FUNC(prop)	\
   (COMPOSITION_REGISTERD_P (prop)		\
    ? XCDR (XCDR (XCDR (prop)))			\
-   : XCDR (prop))
+   : CONSP (prop) ? XCDR (prop) : Qnil)
 
 /* Return the method of composition.  */
 #define COMPOSITION_METHOD(prop)					\